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