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

Change-Id: I1b3ec1439c35b8c273f2320fac1ae4d3b21569bd