Merge "Avoid excessive allocation of std::set<> nodes in SwapSpace."
am: f773e851c6

Change-Id: I06409273385accbf1cdf024190f6f7b7f5717924