Merge "Handle the reboot in the recovery user mode"
am: bace5995f1

Change-Id: I032ddc5a6bba23e4a18a447eca00cc72ddc7a64f