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

Change-Id: I166a09f1b41c32bb69e2859ef262b9d46996ac87