Merge "Switch /data/misc/reboot/last_reboot_reason to persistent property" am: d27aee33 am: e028be05
am: e5f67cb5

Change-Id: Ie63a32a1b78c63db64a9a3e041c23e0b5953734e