remote_control.diff
cherry-pick-8293c5b4cb072038fe2bdc15207ee6de4e291879
