am 14000a3a: am 9a0cea92: Merge "Add a couple more adb shell regression tests."

* commit '14000a3a35d42815a95dce63b40f71e5a6cb9128':
  Add a couple more adb shell regression tests.