Merge "Fix directory iteration when path disappears." into rvc-dev am: c9925a66 am: c805bf84 am: 3c7b7e20 am: 4cba1dc0 Change-Id: Ibc769ca29007cb8ca16d9c46446f774b0418de87