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

Change-Id: I2b1aeac253b8d002643d7383b11bf96fa51868e9