Merge "Add missing write barriers"