Merge "init: fix clang-tidy performance issues" am: 8a779ee959 am: fcbc44a371
am: 1154df5366

Change-Id: Ie65ff389c9291f09290c1810b3b47bedb0b82b72