Merge "Bug 5045498 javadoc for the remote control client API"