8218889: Improperly use of the Optional API

Reviewed-by: jnimeh, wetmore
4 files changed