[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am: 7b2d711d9e am: 43d4bf00eb

Change-Id: Iea2346e652fe6bb086e894615bb409491d60457d