[automerger skipped] Merge "Add more info on control key param" am: d3b99f52...
[automerger skipped] Merge "Add more info on control key param" am: d3b99f52 am: 3c85c155 -s ours
am skip reason: Change-Id Id9d0e0e9cb2eb1eda83d7b5f1bd72be63216d976 with SHA-1 76b2cf35 is in history
Change-Id: I176cb6f2756e33b7d89eefd70253a38fe9647029