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