Merge "Check the buffer index from acquireBuffer" into klp-dev am: d0509021...

Merge "Check the buffer index from acquireBuffer" into klp-dev am: d0509021 am: 668b7f4b am: 54f81e8f am: 8cb7994c am: fa0b15cf am: d158da44  -s ours am: eb7c5080  -s ours am: 8342e031  -s ours am: 26151c1a  -s ours am: e4f5cdce  -s ours am: 8b6cd3c1  -s ours am: f105e6ad  -s ours
am: 57c05dd9  -s ours

Change-Id: Ie2947f09ee8e61a6e1c7bc86bb6e36fc38a7bde1