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

Change-Id: I4344de5426f570dfabdbd8250d8c7ded302f5c9a