Merge "DO NOT MERGE: Temporarily disable the non-snapshot path for archives." into nyc-andromeda-dev