Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev