Merge "scheduler should not schedule volatile field accesses." am: eac21ef261 am: 8a5fa70f52
am: a6083f0305

Change-Id: I5796649f85b15f5c3969e176be5e03d4ef08e198