Merge "Migrate LTE_CA flag to NRI from DSRI"