Merge "Don't crash in TextUtil.concat() with paragraph spans" into oc-dev am: 4972daf992
am: 230e3beda5

Change-Id: Iafd6e9cb942210cb422453570c8ae54d11d50356