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

Change-Id: I4f1c09a66c6292cb6cc7fef6de99d9df0eccaa5d