DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB. am: 8559bbfb3b  -s ours
am: 52991c4639  -s ours

* commit '52991c4639347a2e2b098949fdf91c305f8d41dd':
  DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB.