Merge "C++17 is the default now." am: 8fc15c02bd
am: 9f909492c0

Change-Id: Ic872f06bae64f5ee90db002043132a2de7c7ba02