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

Change-Id: I1147b961e3413d845b4b95e7f2b0c2f6cd10dd65