C++17 is the default now. am: 4f0a2dd588
am: e505da49fb

Change-Id: I72127e89b3ffe35c9befebe06540ddde9a35b542