Merge "Add 5G rat type"