Merge "Address comments for write barrier CL"
am: ef3f32487a

Change-Id: I1d9236c4e9b9a5792e3911131da528557491b7d7