Merge "API Review: split out BidirectionalTypeConverter."