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

Change-Id: I5c025acf56f90864f575ceb6c75487a22dd5a1a1