[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

Change-Id: I44872ebc1f97d7557a5d304d6de6c5cf306724f6