Merge "rootcanal: Check return values from callbacks"
am: 5baca4a9e1

Change-Id: I9806a40a3ceb043ecfd8c6bfad757cc8a18b93e5