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

Change-Id: Ic4de546269b2eb85f79f25900705999a7a5d24e6