am aa4e2462: am e1546df2: Merge "Fix message handling in RemoteControlClient" into jb-mr2-dev

* commit 'aa4e246271fa837c373b71fbaa671f0cbc336eca':
  Fix message handling in RemoteControlClient