Merge change 3305 into donut

* changes:
  Fix parameter mismatch for a couple of RIL commands.