Merge "Don't store deprecated trustedHardwarePublicKey field." into pi-dev