C++17 is the default now. am: fc3c7690fe am: f6b6d72d9f
am: 76ee4f28f6

Change-Id: I71108046cd6fa8ae0566b01a4aa366655f0331de