Merge "Keystore 2.0: Adding uuid field to persistent.keyentry"