Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev am: 922ad6183e am: 0893c50bcf am: 59bc7f77f8 am: 82ffcbd667 am: 9edaa79f62 am: 56c520c4ca am: 12c176066e am: 8671302d0b am: 4a9200308c
am: 2d4e2b4975  -s ours

Change-Id: Ifb9839ce10ac5bd7d60873b434eceefb43182241