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