Merge "Merge "RESTRICT AUTOMERGE Check the buffer index from acquireBuffer" into nyc-mr1-dev am: c422235e9b am: f13d78e7e8 am: 94c024db21 am: 4ffff4e45f  -s ours" into oc-dev-plus-aosp
am: 5e6af54a09

Change-Id: Id9e0c8f330d1a0cd48c6654f66d5ad54f39ca5c4