Merge "Refactor WriteBarrier logic into its own file"
am: ad71d8f3c5

Change-Id: I676011817134f1347fa86fb422b46666b151e1d3