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

Change-Id: I48f25f11a182cb29b03903906afcc55e5ba71406