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

Change-Id: I341911d64699dcf157f61adce0226275336bace5