Merge "init: warn slow action" am: 5782f72711
am: d26107d939

Change-Id: Ic47f75edabca831cbf3c18e575f83378722d2eb2