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

Change-Id: I0c684a434a0f43fcae1a766c6c84a756115d9dcb
tree: 161bddc4a777b06f10432aae620b546c72558854
  1. core/
  2. services/
  3. tests/