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
am: d064f894 -s ours
Change-Id: Ic8c93d7f0abba61ded937756ae2b13888c1007df