Merge "Simplify failure logging code by removed failureLogged boolean flag" into main