C++17 is the default now. am: fcb4afc887 am: d9892c1ce6
am: fc8567fe5c

Change-Id: I128713e396f4ea8ef717803efcba23103ff1b73c