Merge "C++17 is now the default." am: 538a4e789e
am: 9c4f9380ae

Change-Id: Iaf8fce0da5e8adb24a1213b5a88f2eed36095e76