Merge "Fix ModemActivityInfo should have more fields"