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

Change-Id: Ic85b05aeff78a1260efe4ee34006580ea51c9c63