Merge "Add local-only hotspot info into tether state change broadcast" into oc-dev