Merge "Define upper-bound disk quotas for all apps." into oc-dev
am: c86462b7c0

Change-Id: I1ea5db7d8f556fbc04d300fcc4fe8532ea349610