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

Change-Id: Ie7f29f8b10dc1e9158c7574e9836e27e3fda62eb