am 423ab2eb: Merge change 6328 into donut

Merge commit '423ab2eb9df5e2866ecb1f5f975f2f7a660d334f'

* commit '423ab2eb9df5e2866ecb1f5f975f2f7a660d334f':
  String fixes for the credential storage and vpn settings.