Merge "Fix analytics dumping to not throw an exception" into nyc-mr1-dev