Merge "Check the buffer index from acquireBuffer" into nyc-dev am: c12291d88a
am: 2c0e01a4f0  -s ours

Change-Id: I4bff134b14e7fd989eebfa2ac6fecffaf10cec02