strings fixes + remove goo login from xml only

Change-Id: I59f5b710e96600423e89d5a2da201e78cbc61b3a