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

Change-Id: I10bd2f02faa64fc6ee0ea43fe8965d147acc0d84