am f38993ca: am 409b471e: Merge "Explicitly use an older C++ standard."

* commit 'f38993ca440daeac1183269fa12d4773a2ae471b':
  Explicitly use an older C++ standard.