Merge "Temporary changes to fix crashes during tests." into nyc-dev