Merge "Merge "Hide all color hints references" into oc-dr1-dev am: b1ab0ff2" into oc-dr1-dev-plus-aosp