am 983740d3: merge reboot after / before from mr1 DO NOT MERGE

* commit '983740d3f3f12df0cc88907ae2cb35fcc125c267':
  merge reboot after / before from mr1 DO NOT MERGE