Merge changes from topic "am-2c2c464f-fb3a-4c93-8661-57c986c3e069-nyc-dev" into oc-dev

* changes:
  [automerger] DO NOT MERGE SDP: Fix the param_len recalculation am: fa2d999f am: 65f906e7 am: 8f6afaa7 am: e80eab6c skipped: 80aa1aee
  [automerger] DO NOT MERGE SDP: Fix the param_len recalculation am: fa2d999f am: 65f906e7 am: 8f6afaa7 am: e80eab6c
  [automerger] DO NOT MERGE SDP: Fix the param_len recalculation am: fa2d999f am: 65f906e7 am: 8f6afaa7
  [automerger] DO NOT MERGE SDP: Fix the param_len recalculation am: fa2d999f am: 65f906e7
  [automerger] DO NOT MERGE SDP: Fix the param_len recalculation am: fa2d999f
  DO NOT MERGE SDP: Fix the param_len recalculation