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

am skip reason: subject contains skip directive

Change-Id: I4691cda37491ac0ba6580a2fb29f24419d9ee767