Merge "keystore: Add flag for blobs to be unencrypted"