am 62a2b188: Merge "Avoid complaining about empty directories"

* commit '62a2b1882fb95e960b5889b46fe8f669ddc7c8ac':
  Avoid complaining about empty directories