Merge \"QS: Fix missing tiles\" into nyc-dev
am: bd04ec31bd

Change-Id: I7889f69b9f216016ab23e95420e6c1b90f58769b