Merge "Changes to support satellite stats appear as TYPE_MOBILE" into main