Merge "Support registration of offload control callbacks." am: 7ee96625c2
am: 66cc06c2c7

Change-Id: Ieab0ae324ccf8ddfea02adfe647407df6c12b945