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

Change-Id: Ia073b90dbe7ffd2443cf4d4fd183adb2223115c3