Merge "Minor fixes on string resources due to translation issues."