Merge "Add more info on control key param" into rvc-dev am: c0e9ca7987 am: a10f6db4dc

Change-Id: I07b6e12838d4300ac72665b10ebb9ffab1f4a540