am b6331c31: Reconcile with ics-mr1-release

* commit 'b6331c31fede2d6a898892bdf9e9b34618da9756':
  netd: fix argument interpretation bug