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

Change-Id: I2d6daaa53c62cb6c52d6fe809589b7e802fe1d63