* changes:
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am: 51b656f12b am: d305a203ce am: 38961f6b41
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am: 51b656f12b am: d305a203ce
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am: 51b656f12b
DO NOT MERGE SDP: Fix the param_len recalculation