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

Change-Id: I9d422db18f2c87c5f44e8f6e3598d6e597b32c21