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