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

Change-Id: I1c17a2dfff3ce6986db59eb33efadbcb37c164ab