[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am: 7b2d711d am: 43d4bf00 am: 7d92fdbb skipped: 58417f92 am: 5addfc4d am: 20558f53 am: f74d7ad3 am: d3bb538d Change-Id: I8705f0d81fba1027c7a9b506f447482901227c40