Merge "Revert "Drop GNSS1.1 and Thermal1.0"" into rvc-dev