Merge "Use Scrypt to hash all passwords in RecoverableKeyStore" into pi-dev