Advanced reboot enabled by default (2/2)

Change-Id: Ibb6f36b17809041e8cc91fd074a1364e04104a5e