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

Change-Id: If27aab539626a119f144cf7e9dfc0a797f920a7d