Merge "Merge \\"QS: Fix hotspot refreshing state\\" into nyc-dev am: b3ad74eb46 am: d69553b564" into nyc-mr1-dev-plus-aosp