am cb315af3: am fb0b6a81: Merge "Opt-in mechanism for RemoteControlClient...
am cb315af3: am fb0b6a81: Merge "Opt-in mechanism for RemoteControlClient position anti-drift check" into jb-mr2-dev
* commit 'cb315af3':
Opt-in mechanism for RemoteControlClient position anti-drift check