Merge "Eliminate unnecessary calls to onBufferReleased" into cw-f-dev
am: 76456aa438

Change-Id: I9ee9b9146397c46b98c9bf736a10b0e343c4e836