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