Merge "Remove unused assertTransportInfoMatches() method" into main