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

* commit '33c619bb52c9e3e62b7243c9b1d9a75189885427':
  Fix hotspot brokenness