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

Change-Id: Iae4f9ca93a193d24b23410c92659d35a50506b4b