Merge changes from topic "color-vendor-intents" into pi-dev
am: d94b8ed476

Change-Id: I77b9a9969f19aab00d710cbc04ee466c31df3c1b