Merge "Revert "init: warn slow action"" am: 431c489568
am: ea516950fb

Change-Id: I0839b87695043ce0efbf921ffd94364091991b65