Advanced reboot enabled by default (2/2)

Change-Id: Ibcb4938af68f2af1536e0402d8c064bd3003f403