Merge "Add missing ints to palette" into oc-dr1-dev am: 56a1a7d331
am: b3c27864c7

Change-Id: I7103c9a40a3ea3fcf91d914bb8b41d80612f61ff