am 49f61439: (-s ours) Merge "DO NOT MERGE Fix 5389442 RemoteControlClient javadoc" into ics-mr0

* commit '49f61439db7f8960745b0a5664795b5a5ad31ef8':
  DO NOT MERGE Fix 5389442 RemoteControlClient javadoc