Merge "Store staging and snapshot artifict in same repo"