Merge "Merge "Unify storage calculations." into oc-dr1-dev am: 947cb367db" into oc-dr1-dev-plus-aosp
am: 5fc76d5a89
Change-Id: Iae43593a56ce435759739ce16769fcbc3940ced4
This commit is contained in:
am: 5fc76d5a89
Change-Id: Iae43593a56ce435759739ce16769fcbc3940ced4