Merge "Remove misleading unknown param error" am: 48e8d09510

Change-Id: I8511c9409325784ae803a356d69614038aff811e