Merge "Unbundle RemoteService on TV - part 3" into nyc-dev