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

am skip reason: subject contains skip directive

Change-Id: I0b2bba9ce1ede8b42cef8eea2191203ffadf52a9