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

Change-Id: I0c611c22eedda2d849bd16ef2e2bb7e2e60e0a5a
tree: 6b2af61eb5f409046bbf060c89fc0e0a586e6f55
  1. core/
  2. services/
  3. tests/