Merge "init: Remove superfluous error check" am: 186edb1aef am: 4f117206a8
am: 851c379bb0

Change-Id: I1e4f8f2215644b679854f1b644e44b5a2fbd7f9a