Merge "Fix two bugs in external storage accounting." am: d1361ceb0c am: e4dc5d4ec5 am: 0f08cf28bd
am: 8f1b3ed54f

Change-Id: I3324121cd4f987c58cd0065200d21fbdfc98065b