Merge "boot: use defaultPassthroughServiceImplementation" am: da32114e26
am: af6eec2fa5

Change-Id: I4a8ef6ad4e0f2e239cf66b98ae85d6efe000485c