Merge "Remove support for riva/rolex/ugg/ugglite"