Merge "Create a per-boot key on each boot" am: dab5ddf663 am: 6db7fa72a5
am: 03336816a7

Change-Id: I79b13f2fa4c002d5242a5d498ec5db385b7199bd