am fb04e35d: String updates

* commit 'fb04e35d8ff273f73596c8211b3fa1a167a7d03f':
  String updates