[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 skip reason: subject contains skip directive

Change-Id: I87103cba0c9ddce1147af8fc600c83a0d009f22a