Merge "Carrier text handle sim removal" into lmp-mr1-dev