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

Change-Id: I6ddce131248677f79c6f60de693c6caaf06af32f