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

Merge "Check the buffer index from acquireBuffer" into mnc-dev am: ec2549aa am: adfbbe16 am: 11b3066c am: 5f0883c0  -s ours am: 68d56593  -s ours am: e38b2ed0  -s ours am: ead6ac4d  -s ours am: 1d7447ec  -s ours am: c4348402  -s ours am: 436f03aa  -s ours
am: d873e9b5  -s ours

Change-Id: I610e6ffbf502ad93fa4065eab9802f0d9f17fb95