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

Change-Id: Ib784b3bbeb49c56b0f2f2b180c04fc6bec14e68b