Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev am: ee502d5037 am: b104675957
am: d3bb66c47a

Change-Id: I4f998f93f2fca553656f1738f95d62ec28275b6c