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

Change-Id: I1701893d61b9e459b0f22e0165d03f5efadfd56e