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

Change-Id: Ie1e9ed79b0bee5d1c994d5cbb2412d72e957c3bb