am 7b3745fe: Merge "Update scrubClass() to match CoreTestRunner."

# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit '7b3745fe9aa0d78add1045258d2855d5980a650b':
  Update scrubClass() to match CoreTestRunner.