Merge "Improve coverage for java.util.Optional"