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

Change-Id: I20dc12745c89e2bf55aa21ef91c0ec37e57d2a49