[DO NOT MERGE] Fix keychain key upgrade issue
am: 58291e0ff3

Change-Id: Ib1f3f0cea8c13b83b8918e38f7dbdd4d4afd9d7b