Merge "Move palette constants to XML" into oc-dr1-dev am: 8d5b831095
am: 486ce65234

Change-Id: Ib2ff59f4ac52799d420ee3353cedb4762f7a02b1