am e0e5da0d: am 96e59eb8: Merge "Support for multiple tests" into gingerbread

Merge commit 'e0e5da0d648f4167e2a12ea02f4794f81a057da7'

* commit 'e0e5da0d648f4167e2a12ea02f4794f81a057da7':
  Support for multiple tests