am 7c9adaf6: am dc6da58a: am 2a96fc1f: Merge "Fix RemoteController update in RemoteControlClient registration" into klp-dev

* commit '7c9adaf6b90164f17164852276734f95c6d2c46f':
  Fix RemoteController update in RemoteControlClient registration