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

Change-Id: I9101c6fc12457a81789f471a2f8ed5fd36192482