Merge "AOD: Fix icon color when updating on AOD" into oc-dev
am: f0111ce8b6

Change-Id: Ie554c41a43c2a311d217a35fe96a6b81b56ceac6