Merge "Avoid exposing OffloadCallbackEvent values" into oc-dr1-dev
am: fcceb3ada4

Change-Id: Ie91b974fbf70a4242f8b220d5fa3d6a0de59201d