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

Change-Id: I8ced4304e4e6f6f766c7160e25122974ec0c9548