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

Change-Id: Icbc51cf1d5e7dc80b201d8f4642984fbc82b86b6