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

* commit '93e742b58818b3c8130c6cf7ccaba2d0a77d3a72':
  No QS hotspot unless supported

Change-Id: I141c636c23907d19ee33444239afea3239d7e656