Merge "shell is available to the recovery mode"
am: 9a3038ba35

Change-Id: Ib11a0a5bfd12283f332420e150fe8330829d93de