Merge "Pass custom instrumentation args when rerunning tests."