[DO NOT MERGE] Fix keychain key upgrade issue am: 58291e0ff3
am: aa1474b3e9  -s ours

Change-Id: I6881bad273783b5e4de6ad4985f41259394d6677