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

Change-Id: I138ee27ab75e8055f0ca7a081a45cad0f3a4ed9d