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

Change-Id: I2acaf1bd0a03e04611ec29cd9afd04e130e832d0