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

Change-Id: Id390ce18897982a278b0b8b74650e45fa25e5a36