Merge "Cap user-visible cache size at quota." into oc-mr1-dev am: ea842b4e4c
am: f917c62184

Change-Id: I18c707611fb03cccee51531f3f5463f75a8f6690