Merge "Traverse /etc/init in a well-defined order"
am: db7715c7dd

Change-Id: I548824b089b2abd462c83b459bb457fa1bf11a82