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

* commit '4880b436656d7cfd00bb82ebde1b408e0bd19bda':
  Avoid complaining about empty directories