Merge "fix 'adb shell'" am: 1d284004af am: edf501ac81
am: ab48925f5a

Change-Id: I9b0029849f9e882bf308d0ed56cbe697a2549ae8