Merge "Update some strings." into mnc-dev