Merge "Fix to avoid a race condition when consuming buffer." into oreo-cts-dev am: 1304425ec2
am: 842ae0238b

Change-Id: Ic15f35fce8b1896e57c0e6cf5618500c54ab80e9