Merge \"QS: Fix hotspot refreshing state\" into nyc-dev
am: b3ad74eb46

Change-Id: Icda7b70f140101ff07ecad9c5fd661e98ac68230