Merge "init: reboot to bootloader on crash for development builds" am: ac8a3bd283
am: f0cb60083e

Change-Id: I48e0edec7eb951bfbd368096be3d1fd4a1aec6af