Merge "Add unit test for onBufferFreedListener"