Merge "Merge "No QS hotspot unless supported" into nyc-dev am: 93e742b am: f7d9285 am: 3b0dc08"