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

Change-Id: Id3f20a2e45bc7f0bbb9d910f6011cf5c543021c2