Merge "Revert "Revert "Choose the correct Fragment to pull a Transiton from.""" into mnc-ub-dev