Merge "Don't save password metrics to disk." into nyc-dev am: 97848fc473 am: ea9463f542 am: 66d66dd50c
am: b2db3761cd

Change-Id: I3d74f6406b76fbc6858a7359bc08f9b563426066