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

Change-Id: Ia91fd3c0e194a9af4542c1a6a8a9625d05f86d3b