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

Change-Id: I4b13eb4c37ae5b21bde74bbf55e77f51fb8ae238