Merge "Fix hotspot brokenness" into mnc-dev