Merge "Merge "Merge "No QS hotspot unless supported" into nyc-dev am: 93e742b am: 87be8c2" into nyc-mr1-dev-plus-aosp am: 7121db6"