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

Merge "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: ad693884  -s ours" into oc-dev-plus-aosp
am: 696b86b8  -s ours

Change-Id: I81ca1104fac39243a74fe6959e33da47d970c62e