Merge "Added nullable callback support"
am: 35520445be

Change-Id: Ic34fd279a8a125e4ab7fe634dbb38479860932c2