am 3146eb76: am 1708a6f7: am 4880b436: am 62a2b188: Merge "Avoid complaining about empty directories"

* commit '3146eb76cf193ce95f0f88a477b1c708a1b5cf9b':
  Avoid complaining about empty directories