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

Change-Id: I3ad6da3ef83a7a17f49b7388e8c9d9958d79b205