Merge "Add accidentally deleted strings." into mnc-dev