[automerger] DO NOT MERGE Truncate new line characters when adding string to config am: bb3b4ede am: 8b50aeeb Change-Id: Ia1ab5cc9ce36a3087eff3b7caacab41af9979c18