Merge "Don't use fences to implement volatiles" am: ac50d97b1b
am: 557ec469f8

Change-Id: Ic41bdba71dbb5f72b652e6bbd7aaee1573128d83