Merge "Merge "Unify storage calculations." into oc-dr1-dev am: 947cb367db
am: a223ee4890"
This commit is contained in:
committed by
Android (Google) Code Review
commit
363a3374b8