Merge \\\"QS: Hacks to fix bigger problems in TileService binding\\\" into nyc-dev am: 1427bb3dc0 am: 955de27827
am: 1ae5fbb187

Change-Id: I07ea15c56048becb7cba5f27bb7037ae8e10aea2