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

Change-Id: I8e8d6b72df138917006264c71b1417931d1a17a4