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

Change-Id: Ifb7a835ab6633a97a5be32f8b6a699d0c75dde9a