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

Change-Id: Icc279d78fcecaad50c680000aa105f8ac8c48e3d