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

Change-Id: I06ef81f0740eeab2a8822418fe5263308a136cd6