brown paper bag fix: send all the swift metrics

Change-Id: I0eeffee544cecd3664bfa994f5d891b832d69079
Merge "brown paper bag fix: send all the swift metrics" into production