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

* commit 'f7d9285331031587e511361a1553d82d8ecdeb8b':
  No QS hotspot unless supported

Change-Id: I902c3a6ca0e63a6aaa5189add2902c62a4a24a5e