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

Change-Id: Ifacbf19ba2c740c3713b6c2c149a9e27d357d772