Merge "[RESTRICT AUTOMERGE]: Add missing @Test annotations for JUnit4 tests." into oc-dev am: 7289adc7b5

Change-Id: I201f1c1ef7bdfbe05f9e8b0927780c287f3f8d1c