Merge "Adjust run test for target runs."
am: 004b8875b2

Change-Id: I4d5af6f929147e0ce0d805bfca5b3bca81e4d6c6