Fix advanced reboot

Change-Id: Ie2d240069e614a039f2c5e645d5f02725bfac313
Merge "Fix advanced reboot" into lollipop