Merge \\"Restrict hotspot qs tile to admin user\\" into nyc-dev am: ba568a46e6
am: 60075864d8

Change-Id: I9ce47a9ad82f124af60e12d7f9c279150d4e5cdf