Merge "String and UI tweaks for "Mobile network"." into oc-mr1-dev am: 696b67485c
am: d3de291546

Change-Id: Idd776d58816ebcd151da8707c2e72509531e94a0