Merge "Change carrier name shown No Service to ECO" into qt-dev am: 7aee265a7f
am: cfd9ee5549

Change-Id: I7a7907bfa009e036524cb695f1376ab0889977cd