Merge "Fix Flogger issues flagged by error prone" into stable-3.5