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

Change-Id: I2543c7cd24fcdbd13b08e9afc4d1e0a448dc3373