Merge "DO NOT MERGE Fix 5389442 RemoteControlClient javadoc" into ics-mr0