Merge "A few missing pieces for logging in ExtServices"