DO NOT MERGE: Fix broken archive tests.
am: 035939ffd2  -s ours

Change-Id: Ida9e1d48dc79f9aa20c6d578f3d7dde4def0a7b6