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: f6be54e7fe  -s ours
am: d22ce9faae  -s ours

Change-Id: Ia4a4388159962ce5cd4ad36f3a622f9c289896c9