Merge "Unhide invalidateColors API" into oc-mr1-dev am: a8d14a6ea0
am: 6ccce0c175

Change-Id: Ie10774063dab4d36efa63a6f40445e3d752bac6c