Merge "DO NOT MERGE Truncate new line characters when adding string to config"...
Merge "DO NOT MERGE Truncate new line characters when adding string to config" into oc-dev am: 50252a37
am: ae71dc83
Change-Id: Id79a1f421f7a88ccabde0b99af0e5ca32d3b68d0