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

Change-Id: Ie82c6196053d9709e48c76591381d408943f8188