Merge "Clean up sensors hal apex" into main