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

Change-Id: I53089abb23af74febf92aa8c70ca807cb3213a63