am 227fb7be: DO NOR MERGE make reboot default in CTS (merge from mr1)

* commit '227fb7beece841ad8a02ed8381c1dbf07fe2533b':
  DO NOR MERGE make reboot default in CTS (merge from mr1)