Merge "Merge "Check the buffer index from acquireBuffer" into klp-dev am: d050902155 am: 668b7f4b8f am: 54f81e8fe7 am: 8cb7994cbf am: fa0b15cf8f am: d158da44d5  -s ours am: eb7c508001  -s ours am: 8342e031ba  -s ours am: 26151c1ac2  -s ours am: e4f5cdce47  -s ours am: 8b6cd3c1c6  -s ours am: f105e6ad23  -s ours am: 57c05dd9fb  -s ours am: 5e128aa3d3  -s ours am: cf3434f441  -s ours am: 5e67f37232  -s ours" into oc-dev-plus-aosp