Merge changes Ic41afbd0,Ibe264d08 into pie-vts-dev

* changes:
  keymaster: spec does not require that update produce output
  Fix attestation test.