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

Change-Id: I31476f913b38221da2a9ebd0c8f00225dcfa93a5