Merge "init: Fix compiler warnings"