Merge "Fix mte tests to allow auto-upgrade."