Merge "Revert "fix 'adb shell'"" am: 0117aabea0
am: 243d810fea

Change-Id: I26aeb80cad7a20bf8c4ed09222bcd8b0a2799d88