Merge "Minor changes to the API to align the choice of password hashing algorithm" into pi-dev
am: cb686a19e6

Change-Id: I762ca84a7a3f87a729fb38c5182bfd8a4e82d826