Merge "Do not change to the access check entrypoint when inlined." am: 6d92d59fb0 am: c61ac2785c
am: 00df6d2bc0

* commit '00df6d2bc054021c7ea4a45ee440af1c9ba3099d':