[automerger skipped] Merge "[RESTRICT AUTOMERGE]: Add missing @Test annotations for JUnit4 tests." into pi-dev am: 142991b9fa -s ours am: 70a983a0e1

Change-Id: I14dba214fd2839f8fa101c6914a84d42c1b14630