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

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