Merge "No QS hotspot unless supported" into nyc-dev am: 93e742b
am: 87be8c2

* commit '87be8c294e0e524ddd09f2f7a04181be513ed59a':
  No QS hotspot unless supported

Change-Id: If59516c1bed19cec65eb362bc9d7c961b17daf8d