Merge "Add a couple more adb shell regression tests."