Merge "Fix BufferHub state machine to return errors on invalid transitions." into oc-dr1-dev am: 2b7b5c34d3
am: 2c65dd96dc

Change-Id: Ibc6bc20f7f7ed2d5807c2632ba8deaca25ca4fd1