[automerger skipped] Merge "Remove simColors from public.xml and rename" am:...
[automerger skipped] Merge "Remove simColors from public.xml and rename" am: 30970c17 am: 96a4994f -s ours am: 4d04d4e3 -s ours
am skip reason: Change-Id Ida5aafb2db2b47ac5fb0ac098927c0801a717d9b with SHA-1 6132a6d0 is in history
Change-Id: I9ddd6fff42c7202d62e0c75753e3122e8cfba3ef