Merge "Check the buffer index from acquireBuffer" into nyc-dev
am: c12291d88a

Change-Id: I7b6cff8f5bb2cc4c79e02fde50c648276f6c052b