Merge "Removed extraneous string from strings.xml" into lmp-dev