Merge "init: use Errorf() now that we have it" am: 30f6f42c04
am: b0481c01af

Change-Id: I82c26654fc317b213a3120d00800dcb1fcfe9572