Merge "Make AlmostFullTest no longer overfill the disk." into nougat-mr1-cts-dev am: af99dba399 am: 1c4bd09054
am: 4f3a880ecf

Change-Id: If6af168e53c62cc8b477dfa5eb2596a20af53ef3