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

Change-Id: Ica6e0f4aa83701cfd067f22b15dc9629819d64ad