Merge "emugen: porperly handle nullAllowed API calls"