Merge "Methods to calculate user and external disk usage." am: 4d9746d7a3
am: 15e80e0436

Change-Id: I63799087ee8b62b68da1f39ee2495b54481bd866