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

Change-Id: I76b21c0ea4ab7394281ee8c82ed67179eb9ea966