Merge "Remove simColors from public.xml and rename" am: 30970c1745

Change-Id: Ib630dc1391d66c68634ec69f0eea15606fe0c133