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
am: 7cf947cb -s ours
Change-Id: I749181d35395cce99bd0dd9238174603137189fc