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

Change-Id: I9674640ffa53c4998c9d4f52340803e309b04eb1