Update for Bcrypt

Change-Id: Ic333f41c79210b9da1bdd2147aeb3d81d8bf3627