Merge "Merge "Remove STOPSHIP code from CarrierTextControllerTest" into qt-dev am: 39ac1d5012 am: 7a734a376a"