Merge "Don't save password metrics to disk." into nyc-dev am: 97848fc4 am: ea9463f5 am: 66d66dd5 am: b2db3761 am: eadd29ff Change-Id: I1147b961e3413d845b4b95e7f2b0c2f6cd10dd65