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

Change-Id: I400e3759e5066b67f57e5b75801391890548239e