Merge "C++17 is now the default." am: 538a4e789e am: 9c4f9380ae
am: b39caf5763

Change-Id: I458e558adff8125b0a163635185ed86e06eaf1f3