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

Change-Id: I311d3fa978ca1a7d74bc6403be59705dd9ea995e