Merge \"QS: Fix crash in tile API\" into nyc-mr1-dev
am: 77d8771b30

Change-Id: I6669e736208ada6ebd5bd2fc9e0466f924bffd6a