Merge "Fix directory iteration when path disappears." into rvc-dev am: c9925a661c am: cd32fa7b28

Change-Id: Ifcf7309cab5c818f98a9fb888668413db9ddff93