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

Change-Id: I7c7675922a561a4642120df51715a550dab7f503