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

Change-Id: I67c391cd59f53682267b98a4db961cc9f9cf08fa