Merge changes from topic "am-c41d9dbf-12e7-4386-8be3-987a152ba46e-nyc-dev" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am: f52eea13 am: 44a4d58d
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am: f52eea13
DO NOT MERGE Truncate new line characters when adding string to config