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

Change-Id: I5e7e5b93e639166dd350701b5228088ca5f5b19b