Merge "Avoid read barrier for UpdateEntrypoints"