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

* commit '9a0cea92c8b74114b70ac3339b2b611633f6a31a':
  Add a couple more adb shell regression tests.