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

Change-Id: I1a717cac2a2f74242d9b981604273bf127e9b63b