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

Change-Id: I954e87563f1a8222be418221657e730ffda51814