Merge "defaultPassthroughServiceImplementation: default"
am: 5ff3e56dd7

Change-Id: I12f458db73d46b4a142832c0b2b1b0421fe3f76f