Merge "Unbundle RemoteService on TV - part 3" into nyc-dev am: 7981e8f
am: a2262b3

* commit 'a2262b3bb15497c6ee4854cfcf7a43fc07c2c876':
  Unbundle RemoteService on TV - part 3

Change-Id: I45fbdda42aa5d9f5d9c25a027dd11eb7b0f560a1