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

Change-Id: I38076336d0383af879206995be6b3feef73b2a5f