Merge \\\"QS: Hacks to fix bigger problems in TileService binding\\\" into nyc-dev am: 1427bb3d am: 955de278 am: 1ae5fbb1 Change-Id: I07ea15c56048becb7cba5f27bb7037ae8e10aea2