Merge "Add overrides support for snapshots"