Merge "Drop GNSS1.1 and Thermal1.0"