Merge "Add back keymaster@4.0 hash." into pie-vts-dev am: 6a20e646e4
am: 472e5f4355

Change-Id: I7989b61c31c83e4e720970aef6c25db2d442fb39