Merge "Add custom cts-tradefed help text and prompt." into ics-mr0