Merge "[RESTRICT AUTOMERGE]: Revert "[RESTRICT AUTOMERGE]: Add missing @Test annotations for JUnit4 tests."" into pi-dev