Merge "Revert "fix 'adb shell'"" am: 32778ca983
am: 5e5762e7d7

Change-Id: I26aeb80cad7a20bf8c4ed09222bcd8b0a2799d88