[DO NOT MERGE] Fix keychain key upgrade issue am: 7593bbf15a am: c06ec2348a am: 1ed3e156c3  -s ours am: 0d3e006ed8  -s ours am: 383607b113  -s ours am: 62990b5484  -s ours am: efcaf661e7  -s ours am: 240fea4f73  -s ours
am: 0d53d0072c  -s ours

Change-Id: Ia67c230c83439d8559c6bf5609a2051f4bc199ed