Merge "Remove simColors from public.xml and rename" into rvc-dev am: 9c11d2ec45

Change-Id: I66bb9443504b53fb04be956acc9fea9bef270931