Merge "Fix key upgrade on begin" am: e229d5efac
am: 5891b0d4e6

Change-Id: I2eab2a0d21e131e6957db51255f7eb653fc4f538