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

Change-Id: I8e24a7b278150bbb8b1e4b629f1d3473a732e7b9