Merge "Remove obsolete logging section"