Merge "Methods to calculate user and external disk usage." am: 6a9ad141 am: 7beb2b75 am: 669affdb am: 91b91b7f Change-Id: I7859db9f53560ad602bb26f37854bdfc02f15d09