Merge "Do not override managed versions"