Merge "Make password history hashing more secure" into pi-dev am: 66b6d1c3bc
am: 1e90f0135f

Change-Id: Ie67bb7caa2c1fec8c58d876171586ee88d16409f