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

Change-Id: I5e08296685de073f16827458216154ba16cf9b1f