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

Change-Id: I8d2bf30740b89e49a59927a867be2334aeb5b608