Merge "Fix broken and flaky unit tests" into nyc-mr1-dev