Merge "Make it easier to subclass Content and ContentHandler subclasses"