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

Change-Id: I3e686c5767de5e201954f98ed51eb663d13a7a95