Merge "Revision: Inject Logger instead of LoggerSpi"