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

Change-Id: I8ba10a59644aea26f54831bc0ed0486c782aa29a