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

Change-Id: I7b13469b249e5a159e3be9d1ee264f2616ebcd22