am f64d9458: am 89359c0d: Merge "String needed for Hangouts IM field work-around" into lmp-mr1-dev

* commit 'f64d9458e0cede9a6aed9da6c3cdbcfc5455a4c5':
  String needed for Hangouts IM field work-around