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

Change-Id: Ic7173d8c8af63d8791980c307746a6bcab34e556