Merge "Change --no-collect-device-info to --skip-device-info/-d." into ics-mr0