Merge "Create directory to store pre-reboot information before reboot" am: 9272319714 am: 1b7787e33a am: 0a1b6ab601

Change-Id: I94d6c085aa1b29af51bdf40d615729f6b7bd8d95