[automerger] DO NOT MERGE Truncate new line characters when adding string to...
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am: f52eea13 am: 44a4d58d am: 6dea8b37
Change-Id: If09082226b692af642ce8e1f312e9adb6e0280a6