Improve run-test tooling support am: 8d94dddfd6 am: 6fcc428ff0

Change-Id: I45ea356fc1f16f1e9008209586657f6dc9c47b9c