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

Change-Id: I7229c883efc6078b4fe3aa8231912eda1073ae48