Merge "Iterate through the sorted file map when finding transfers"
am: a7229a08b7

Change-Id: I736816c3f139635b11e8c7c6d02f06c96a455454