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

Change-Id: Id7bdc3b25ac9bd8c9931d6c145a1ac5839b9a1a1