Merge changes from topic "am-f4bfe0c3-4263-420c-abf9-a0e5b20986ff" into cw-e-dev
* changes:
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am: a6d9c143 am: 0393d440
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am: a6d9c143
DO NOT MERGE: SDP: Recalculate param_len after max_list_len