Merge "Start logd and service managers during the 'init' trigger" am: e72274ac2b am: 16c0a5581e
am: 332096aa65

Change-Id: I1206fa0201579ac733db8b896e346e1c29ad8bf4