Cherry-pick legacy sensors for Omni 4.4 too