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

* commit '1708a6f74bf36ad6d520476895695c26bdaf7306':
  Avoid complaining about empty directories