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

Change-Id: I694373001cdec6bf6f4a9c71c66f4c088ab6a290