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

Change-Id: Ifd52af46a3abb51d5a92a189cc652bf02e325fc0