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

* commit 'dc6da58aa79f97d6bbd0fa8fd4e694f1e76973f0':
  Fix RemoteController update in RemoteControlClient registration