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

* commit 'eeeb45a76d477c4c1f8590775de83e30a67501d9':
  Fix hotspot brokenness