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

Change-Id: Iab989b278e3280e8c28b3db2278ce977b8a67a2f