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

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