Merge "Revert "Upgrade RequireAPI annotation to prevent wrong lint error.""