snapshots should include standard, not just base + extra

Change-Id: I0d4b9ba7a48fba46cea7313a19379dc1d9b04014