Merge "Merge "Password field colors" into oc-dr1-dev am: e21a151fe7 am: 1ea58e5016"