Merge "Bug 5045498 RemoteControlClient interface"