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

Change-Id: I9c33dec885f7ba742d26f95d2b9fbff9984ba2ad