Merge "String needed for Hangouts IM field work-around" into lmp-mr1-dev