Merge "Start logd and service managers during the 'init' trigger"
am: e72274ac2b

Change-Id: I738bff3b371783691eb3d703a3c2df5d122b0af9