Merge "Split defaultPassthroughServiceImplementation into reusable parts"
am: 3a78b44a4e

Change-Id: Ifaa43adf7eb68ae58a212a679326436696cef176