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

Change-Id: I5e05e4a5b3fa4bc5a651b7a7a010dbee36300239