Merge "Don't run find on directories that don't exist" am: c1df498f0c am: a8839ac623 am: 3432bf504c
am: 5761aa2015

Change-Id: I5c8cc32c1aefffd46e642eb50cf0c54ececc6d86