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

Change-Id: Id75563fde57d06ac964cf82b161b342e1c8d97f4