Fix merge issue from AMZ linux patch