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

Change-Id: I70e11136f6e261cccf4ce57f757f97999f74b402