am 47b9d250: am 33c619bb: Merge "Fix hotspot brokenness" into mnc-dev

* commit '47b9d250220f7eaaef7465367fd6ff0d2c86f4e1':
  Fix hotspot brokenness