Explicitly import our Optional type to avoid ambiguity with Java 8's Optional.

+review REVIEW-5165