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

Change-Id: I57a5808ced1b7ce642b9643b7d46fc5915b25d4d