Merge "shell is available to the recovery mode" am: 9a3038ba35 am: dc008fa6f6 Change-Id: I5bd22b27d4d033ae3483f000da6a1a901f19427f