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

Change-Id: Ie39fee6399eb1445ad439da1703d97d709860859