am 4c3959ca: am 81a64064: Merge "Remove the /dev/.booting file before triggering boot."

* commit '4c3959cabd50a667f4ea5ec8fb0fe1369ec0d96b':
  Remove the /dev/.booting file before triggering boot.