Merge "Check the buffer index from acquireBuffer" into mnc-dev am: ec2549aa62 am: adfbbe1684 am: 11b3066c06 am: 5f0883c02a  -s ours am: 68d565932f  -s ours
am: e38b2ed078  -s ours

Change-Id: I313dd576ed1d35be2b08913e84c0b3c92a869e54