Merge "Add support for storing upgraded RKP key blobs"