Merge "Fix Strict Mode violation in SnapshotProvider."