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

Change-Id: I6f8955505f51de3077e369c5a3a46185bf826b8a