Merge "Frameworks: Annotate JUnit4 test with @Test" am: 4d9bec6b4a
am: a7c5afafe3

Change-Id: I70e11136f6e261cccf4ce57f757f97999f74b402
tree: 0a7472469dbc4eb5c1a58c613143eaf18fa56926
  1. core/
  2. services/
  3. tests/