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

Change-Id: Id886b02bb808957c923e39e70f253ea18c605812