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

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