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

Change-Id: Id6a31d4db40a4ce7a51a0b3832b821406f112d02