am f17f0e0e: Merge "Save OwnerInfo so CryptKeeper can display at boot time"

* commit 'f17f0e0eb0eef424401caa122e51a648f5ef3801':
  Save OwnerInfo so CryptKeeper can display at boot time