Merge "Avoid read barrier for UpdateEntrypoints" am: 287fd33a9f
am: ccfc007a3f

* commit 'ccfc007a3ffc35e1896848cbaf2e997b36092e57':
  Avoid read barrier for UpdateEntrypoints