Merge "Fix 5389442 RemoteControlClient javadoc"