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

Change-Id: Idb27ae71443472b29fdc636513bb9d0e554d4d91