Merge "revert gerrit change 29597 for TextContent constructor"