Merge \"Fix the syncronization issue between read thread and write thread\"
am: d0c8ccb266

Change-Id: I8d2a758c2404a1feb3c8b02c63fa1a1c69406e99