Merge "Strings changes for opportunistic mobile networks"