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