Merge "Add back keymaster@4.0 hash." into pi-dev