[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am: 51b656f1 am: d305a203 am: 38961f6b Change-Id: I2b54ca809d16ca1df0a9061301f76cf64c16243e