Merge "Fix typo in SwappedOut reporting" into nyc-dev