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