Merge "Fix two bugs in external storage accounting." am: d1361ceb0c
am: e4dc5d4ec5

Change-Id: I61ec7deb5d7196259e83de0a141ef23d198b9f1e