We should separately add a lint to ensure no new usage slips in. Backport of #36819 Co-authored-by: Craig Tiller <ctiller@google.com>
f45ac2c9e4