[automerger skipped] Merge "[RESTRICT AUTOMERGE]: Add missing @Test annotations for JUnit4 tests." into oc-mr1-dev am: c701ebc86e -s ours am: ad8d6c1010 -s ours am: ed6dfb63a0

Change-Id: I4e47c0e45d5caefe48f3ee73b73a6be52b97d67f