Avoid creating null parameters

Change-Id: I63c4498560fdc5dfeb6ffa3e29b6620432994ce1
Related-To: PROD-36193
1 file changed