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

Change-Id: I276acd89f0219a1715824011c0e1ce7820aa57df