[DO NOT MERGE] Fix keychain key upgrade issue am: 7593bbf1 am: c06ec234 am: 1ed3e156 -s ours am: 0d3e006e -s ours am: 383607b1 -s ours Change-Id: I8e8d6b72df138917006264c71b1417931d1a17a4