Merge "Don't run find on directories that don't exist"
am: c1df498f0c

Change-Id: If0792cb62b7e666ca700dbb9b0dbf4b3d6d3cd02