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