Merge "C++17 is the default now." am: fbb102ea84 am: ccb3d1d61a
am: 8dd21cd6b5

Change-Id: I79e72e3a99c9590fdbaab72507044aa85dfa38ef