Merge \"Fix disabling of tiles that are not relevant\" into nyc-dev
am: 9c5d3164f5

Change-Id: I778f8f766ace689b1bd4174000daaafb13253516