Merge \"QS: Fix missing flashlight tile\" into nyc-mr1-dev
am: 761d89ef4e

Change-Id: I3761bee17e20d8c6039220766d195f2d5536c27a