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

Change-Id: I6eef632d7ca4f8085a5a357038fa63d8a5d49d35