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