tree 4d27212258941bfdb7ec461208ff69a2da12ad32
parent 462b91aae1d57eb389125e4930dcaa7303da1d6c
author Christopher Ferris <cferris@google.com> 1678744248 -0700
committer Christopher Ferris <cferris@google.com> 1678746167 -0700

Add missing changes from ARCH removal.

I somehow didn't upload these fixes from the review. So doing that
now.

Test: Unit tests pass.
Change-Id: Ia17e480eb972db4f7be6947c0e6567632c65431f