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

Change-Id: I8f884d17ccd8c58a86d389633be80da08cd0e8d7