Make SDM use callbacks correctly.

Bug: issue 8933
Change-Id: I79d6d3cf0ec25d8d74236e98f5204c3e4fd6f8ab
2 files changed