Merge "C++17 is now the default." am: a4b74660a2 am: da87885233
am: 4e9ba413da

Change-Id: I6651e28f504c0a4b67ab0adb21058ac5af7462f2