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

Change-Id: Ie9d7f0209ad248035cb65c9e6d04236ba61a9264