Merge "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 am: ead6ac4da1  -s ours am: 1d7447ecb7  -s ours am: c434840227  -s ours am: ad69388455  -s ours" into oc-dev-plus-aosp