Merge "reboot: only pause indefinitely for non-shutdown operations"
am: e808f9213c

Change-Id: I8386ad08ff53f94b78bae713f614f962a92637d2