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

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