[automerger skipped] Merge "[RESTRICT AUTOMERGE]: Add missing @Test annotations for JUnit4 tests." into oc-dev am: 7289adc7b5 am: 8ec1ed7a7c -s ours am: 6f6f808ce5 -s ours am: 779fb3d051 -s ours am: fec067abdb -s ours

am skip reason: Change-Id I1ae379ebe2826f2e2dbee24333291fc295430de7 with SHA-1 ae621cb53e is in history

Change-Id: Ibdb1dd5b87160ac8ee413a1eae607ee3ae14a591