Merge "Change BCB to perform synchronous writes." am: 5797bf9c90
am: e51d0b4d38

* commit 'e51d0b4d3867e740cb86e4830cdbcb3d4be473e8':
  Change BCB to perform synchronous writes.