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

Change-Id: I45700eef5e0a9eec1bcfdc4d810f20d2a5668531