Removing some deprecated callbacks
am: 5340584

* commit '534058492ff7d9a8a75b0fe709bddb6c3f6dcd79':
  Removing some deprecated callbacks

Change-Id: I5904271480b2952a1317cc97bf7f01363068a9d3