C++17 is the default now. am: 237a0d91a5
am: 3bc5c02406

Change-Id: Icbcde449cfb7779e9773046965058d7acf8dc61c