Merge "Check the buffer index from acquireBuffer" into mnc-dev am: ec2549aa62
am: adfbbe1684

Change-Id: I2c5cb01a4d8fbeaed1dbadc5cb1ab3b4a0f7d60e