Merge "Fix non-admin compute quota issue"