Merge "Remove hack to enable INFO logs"