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