Merge "Check the buffer index from acquireBuffer" into nyc-dev am: c12291d88a am: 2c0e01a4f0  -s ours am: 05bfca63f4  -s ours am: 33971b3c84  -s ours am: 943ed32642  -s ours
am: 26b720b851  -s ours

Change-Id: I638b42423d481b6e7c3242888c68f76f18680b1e