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

Change-Id: Id798ab5cd26914facc58b74da4fbfef9629fc43b