Android CTS 7.1 Release 3 (3764431)
Merge "bundle init.rc contents with its service"