Merge "C++17 is the default now." am: d1842c4386 am: 5c567684ff
am: 239debf1f3

Change-Id: I81b42007d9a2688b0a67109dc1b399673b9c6d50