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

Change-Id: I13e12ece1adb4babeea580a53a094a305e3819f3