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

Change-Id: I9556015cd225a75cb41be101c67333a641e549bd