am 5581c1e3: am 00615f01: Merge "Allow mkdir() race to succeed." into jb-mr1-dev

* commit '5581c1e3e2d359f71b14c20f44c6a58c18e27248':
  Allow mkdir() race to succeed.