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

Change-Id: Icebc7d92aaa4e8b03952ad375a79cf59fd258bc1