Merge "Move more Class annotations to native."