[automerger skipped] [automerger] DO NOT MERGE SDP: Fix the param_len...

[automerger skipped] [automerger] DO NOT MERGE SDP: Fix the param_len recalculation am: 1bd445ff am: 3eb8f155 am: 0fa926c0 skipped: 256c8f87 am: 61a380b7 am: 7e42ed13 am: 50e670a2 am: 5381b8b1 skipped: a8de5bbb am: 64739b28 am: afaabd4a am: b48bc70c  -s ours am: 63ff975b
am: c06e48a8  -s ours

Change-Id: I099e3147992b371a0723a3f471d48dbbdb0f1c6f