Merge "Make image metadef tests admin-only"