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

* commit '2845dc2428f2db4c1579155db9185618a6e8f513':
  Add support for JUnit4 Parameterized tests