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