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

Change-Id: I071bdfb5a145ddd0589dfb515550a61f280fd4c5