Merge "Fix thread race caused double free issue." into nyc-mr1-dev