[APPROVAL] INTERNAL forward_std_names-drqs-46623495 to master

Base commit: 34b3474cdbd1b7709169148862acfe22aff58c31
Revert "[APPROVAL] INTERNAL forward_std_names-drqs-46623495 to master"

This reverts commit 54c1fa2fe6e5d51975b598c5aee50dbf4ea6faaf.
[APPROVAL] undo-bad-merge-drqs-46623495 to master
[APPROVAL] INTERNAL rebase-forward_std_names-drqs-46623495 to master

Base commit: 67eb6f599d0de12d6f35a844e6d4426c05c4809d