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

Change-Id: Ia8043ec41fd4589a300aa2780e775d003e0f2d0a