[DO NOT MERGE] Fix keychain key upgrade issue am: 58291e0ff3 am: aa1474b3e9  -s ours am: 5b60e7659c  -s ours am: 25f39e9fb0  -s ours am: 8bb6666acd  -s ours
am: f247e0703f  -s ours

Change-Id: I32b3e55a04e5f486c9d31886ff0085e37f805977