Merge "Cap user-visible cache size at quota." into oc-mr1-dev