Merge "init: Stop combining actions"
am: 8d644d2c96

Change-Id: Iea55e5b88f42013ad83fab68682c1b5403eff0b0