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

Change-Id: I33f664e14d325933945ebbed1a499c0d5597dbf2