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

Change-Id: I12d9a6d18654673e5912416550c64e81aab857f9