Merge "Check the buffer index from acquireBuffer" into klp-dev