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

Change-Id: I5c4b1a81b0e9ca203e98098d8673f6881d846c78