Merge "Unhide the enum/function for the password hashing algorithm scrypt" into pi-dev am: 9ec7026e92
am: 2e815c6e74

Change-Id: I3374a90dbdee1feb2eeecd054da6069c3e630802