Merge "Merge "Choose correct icon shade of grey" into oc-dr1-dev am: 1f358f1885" into oc-dr1-dev-plus-aosp am: 895176dc42
am: b6d221931e

Change-Id: I97bafd3afcd7cc0102f139e16fd9bb134a922f87