Merge "init: Stop combining actions" am: 8d644d2c96 am: a0b0c8a18e am: 779e922866
am: d949df5f57

Change-Id: I2b8b3e244089ea45a7b80fa7b88a8cd9d41e6896