Fix archive tests.

Test: Archive tests pass again.
Bug: 35797359
Change-Id: I2c1548078acd02a682b796a03f578b0dbf57bc2c
3 files changed