Merge "Fix key upgrade on begin"
am: e229d5efac

Change-Id: I80d9b92c9a73d083559be727596b4f83c1f3c16c