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

* commit '6bb6bc20d99dd79400f12ff60dccd2b59a91c383':
  Change --no-collect-device-info to --skip-device-info/-d.