Merge "Revert^2 "Drop GNSS1.1 and Thermal1.0"" into rvc-dev am: d32364c7af am: b4c21f0762

Change-Id: I2c99b98d6cb059549ed33eea3d84314043d54968