[DO NOT MERGE] Fix keychain key upgrade issue am: 7593bbf15a am: c06ec2348a am: 1ed3e156c3  -s ours
am: 0d3e006ed8  -s ours

Change-Id: I77ee7a76670bee6284c473c5c152491094d06483