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

* commit '00615f017bcc4be5a6ce02f1eeeebe59dbd381df':
  Allow mkdir() race to succeed.