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

Change-Id: I076fdf3fbc953f3539b70e749a90c67421d9eea4