Merge "Handle nulls in Java autogeneration"