Merge "Choose correct icon shade of grey" into oc-dr1-dev am: 1f358f1885 am: 2102a0fb80
am: 8b85c9e267

Change-Id: Iec104635e6835e35a55c93f42bdf523bec18a1d8