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

Change-Id: Ie628d3bc340778d7f7f0411c3b355d5084eb3d7d