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

Change-Id: Ic622d551181566585be89380e32658e963768cbf