Merge "Added nullable callback support" am: 35520445be am: 19f9299af6
am: 0659e60b98

Change-Id: I289b8cbb5bceab13c7684a2509e79e77828c07fd