Merge "Allow mode of TileService to be changed" into nyc-dev