Merge "Fix directory iteration when path disappears." into rvc-dev am: c9925a66 am: cd32fa7b am: 60736e4b Change-Id: If8dc3c83687c3124fb079fbcf2e2bcc5e7305c10