[Regression] Fix Quota Permission Context regression after rebase.
Merge pull request #883 from jeez/fix-quota

[Regression] Fix Quota Permission Context regression after rebase.