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

Change-Id: If387eefb5503596b22f4f64ad4e5071d0d06d342