Merge "Update mapping between RAF and Network Type." into lmp-mr1-dev