6989297: Integrate additional portability improvements

Reviewed-by: vladidan, dholmes
9 files changed