8009517: new code changes causing errors in old build (-Werror) environment

Reviewed-by: mduigou
2 files changed