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

Change-Id: Ia56398d1de13dc98c004b1a2fe678403b98300f4