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