Merge "support for subclass-custom span convert behavior" into ub-gmail-ur13-dev