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

Change-Id: I0a30a107a7194912a3f57faa215d832e94d86b3a