Merge "Explicit API for allocating disk space."