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

Change-Id: Icffd0963da20708508e761e57f54f0c441570f98