Merge "Add mapping between RAT and Network Mode" into lmp-mr1-dev