Merge "Fix race in buffer ref counting." into honeycomb