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

Change-Id: Iaf751eb70fc63987169b4390d5ec9c2628b6c1b4