am 5fb28ffc: am 2845dc24: Merge "Add support for JUnit4 Parameterized tests"

* commit '5fb28ffc233c0d23e0a211f30ac2f2b9a1aafbb1':
  Add support for JUnit4 Parameterized tests