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