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

Change-Id: Ifeba3b1a962c33cf355fa897a7177845630be16a