Merge "Don't allow using or allocating a buffer after the first state transition" into nyc-dev
am: 3294a9fe16

Change-Id: I61c43661f42204e9aeebb44df9418d7ca5bb9e8e