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

Change-Id: Ibc4532047231bc93ff876f13c328957e3cc2cffa