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