Merge "Add unit test for shared/unshared interface quotas"