Summary: Allows use with std::optional when available

Reviewed By: WillerZ

Differential Revision: D25618828

fbshipit-source-id: 3e039406ff1e885fd1767148b907635b23f7a88b