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

Change-Id: Ia98c166b44f3b17e3b1f9558a1053254df47cea7