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

Change-Id: I7ff48f46c4d04d732ced69265339f05267f3325f