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

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