C++17 is the default now.
am: fc3c7690fe

Change-Id: I71bcd81bd872e467009a90a72e54a974f7194ece