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

* commit '7981e8ff6509769a590f15b440f989437d732be5':
  Unbundle RemoteService on TV - part 3

Change-Id: Ib5eb6363e904a1f66000d12263f66a8e5bd1f663