Reland "Simplify and document entrypoint toggling in instrumentation."

This reverts commit 677d9eff19ef66eceb30324ec876dc8ba3a306e6.

Reason for revert: other instrumentation fixes got in.

Change-Id: I01f6896521ce7bf5497523f616c5288f29c50120
8 files changed