Revert submission

Reason for revert: Buildcop - Build breaking references to std::optional

Change-Id: Iad8f9de8ee5539cc9eaca35d7fad2e8d2e8c92dc
9 files changed