Merge "C++17 is the default now." am: a7f54b1592 am: e2d543484b
am: 4591f2db9a

Change-Id: Ib995e5bb225c909dc4302229291a0cd690506bee