Merge "Convert updateChunkStatus to using a flush commit()"