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

Change-Id: Ic1ee69858d27b8d695f075bd436faa04795f058f