Merge "C++17 is the default now."
am: d1842c4386

Change-Id: Ib34759c49e6e102c8d4c606fca9ec66d5918d8fe