Merge "Save OwnerInfo so CryptKeeper can display at boot time"