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

Change-Id: I9c89df82dbae23e5cc550b28357a908e88d01a4a