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

Change-Id: If317eea5865d9102ada2a89fd1f081006d801147