[DO NOT MERGE] Fix keychain key upgrade issue
am: 7593bbf15a

Change-Id: Id3cf379aad3fc6475a737bf5ebc92549075d18fa