Merge "Traverse /etc/init in a well-defined order" am: db7715c7dd am: 31dcb81e63 am: 010624bd2c
am: af97f66b59

Change-Id: Ib13e0e5a02db8719fa8fc3edea7db6fcd5f95ed3