am 31603aac: Merge "Validate commands and arguments." into ics-mr0

* commit '31603aacbb54b98cbee498412f6a5eb9dd4a2788':
  Validate commands and arguments.