Merge "Avoid exposing OffloadCallbackEvent values" into oc-dr1-dev