[automerger skipped] Merge "[RESTRICT AUTOMERGE]: Revert "[RESTRICT AUTOMERGE]: Add missing @Test annotations for JUnit4 tests."" into pi-dev am: 7ecafcfa2d -s ours am: 3b67070c64 am: de0817f45d -s ours

am skip reason: subject contains skip directive

Change-Id: Ibf5f3c584253db6592aecd790d9da69bc4b61491