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

Change-Id: Ie7f367079527d240b5db9c6115ea98bb68113a70