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

Change-Id: Ic2fd1d814e31d2f0705ae0acd2c59939e621918f