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

Change-Id: Id4f68d9eddb9e990fef07a306564a1619e87978b