Merge "Revert "Additional log on plug-in self-registration and failures.""