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

Change-Id: Iab076b534faf6ffa9496e9104674544b97a8c970