Merge changes from topic "am-2c2c464f-fb3a-4c93-8661-57c986c3e069-nyc-dev" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am: 51b656f1 am: d305a203
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am: 51b656f1
DO NOT MERGE SDP: Fix the param_len recalculation