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

Change-Id: I75ce732b58516e45084845da2c42a65c2b31aed1