Merge "Fix thread race caused double free issue." into nyc-mr1-dev am: 68ec3695d0
am: a2b5c8a912

Change-Id: I9ceebadf59e2355d2cf4e101fbe67a8de54ccf99