Merge "Remove misleading unknown param error" am: 48e8d09510 am: c215e1e993 am: b749d99cdb am: d7810bd57d am: 2a621b67f7

Change-Id: Ie7f1a15a6bcfe385b31409d7fdcd8244e86b2954