Merge "Fix flogger errorprone compile time errors" into stable-3.5