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

* commit '3b0dc0858933f83dddf867c9942cc6c7199eeab4':
  No QS hotspot unless supported

Change-Id: If56db20af5cc72f6f479bb042d9da952a5fb5573