Merge "Avoid exposing OffloadCallbackEvent values" am: aff0d1afb6 am: 74868feecd
am: 1b6044f363  -s ours

Change-Id: I2f2ac148c3a2042d3a96013a14e1efd92886c241