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

Change-Id: Ib8a433cdcfd4888e03894237fb7876ed1b498f0f