Merge "Avoid exposing OffloadCallbackEvent values" am: aff0d1afb6
am: 74868feecd

Change-Id: I5495caada5fc8869c4c770bbddb37d73b2603f62