Merge "Get a hack in place for broken quotas." into oc-dev am: 99dfb8a646
am: 6df1c78ad0

Change-Id: Ic37d8fd86a326be3cf38fef6e28129c6f5637d65