Merge "init: enable C++17" am: e3aef3dd99 am: e4275b52a8
am: fdad550029

Change-Id: I308ea437c7a5faa76e995200a4506cdf7d47e9ea