Merge "Check the buffer index from acquireBuffer" into klp-dev am: d050902155 am: 668b7f4b8f am: 54f81e8fe7
am: 8cb7994cbf

Change-Id: Ibf23434ea242faa85098c73747d1dc42ad5c85ba