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

Change-Id: I0026b0ef43e9918811591f416a370dff84254df4