Merge "Add more info on control key param" am: d3b99f52cf

Change-Id: I7d68bb7c955d47b1b597ee02b169fa24b37f2ba2