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

Change-Id: I9d59a91f2a63115978bc48087a721cd7e6d8facb