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

Change-Id: Ie807b12e8bc12043d94613fec3be71b70a534e84