Merge "512441: Fix PolymorphicDispatcher selection algorithm"