Merge "init: fix last_reboot_reason string" am: 59c74a3bd1
am: 2be5884903

Change-Id: Ia1587bdd33faae3d0b3c0d31e3e799efff6d4642