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

Change-Id: Id4d11d780e9d48269a44b712b394046e86faf360