Merge "Remove unnecessary clinit checks"