Linnux compile fixes
p4#: 20434