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

Change-Id: I8345110eae43102a3c447efb0d039c9ee90fa886