Always pass in node when escaping content string

Change-Id: I3d7950104850c8fcc03eb19f468c511af21b0cf5
Merge "Always pass in node when escaping content string"