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

Change-Id: Ifa4eeaf32cd5a7d5ab77c0e20d3ab5d5b811def5