Merge "Fix a bug with volatile fields."
am: 326220ff49

Change-Id: Ic8d13be3d01366fc8cb0a0ccecead890aa321fe0