Merge "Traverse /etc/init in a well-defined order" into nyc-mr1-dev
am: 5639d9ad6e

Change-Id: I7f22d6962b2b40abed3b44dcf15242144f2a4e24