Merge "Add missing write barriers"
am: 2e63900235

Change-Id: I3cddcabff9f4e7c7eb8450242270b783aad388ca