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

Change-Id: I1561c0ce1564454601c80f4f87512b8e0796549e