Merge "Frameworks: Annotate JUnit4 test with @Test"
am: 3a12454f9a

Change-Id: I9c6001ca771d3d2dfd1bdda10661cc685ff0d7bd