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

* commit '85670df03c2ea3f561fa27bd11fd6bdf43b38b0b':
  Fix hotspot brokenness