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

Change-Id: Ib2fdd178c0de90221a460cd1839de56ff02ed1dc