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

Change-Id: I8d967578e319aa20d17a9b0535851a54bc545f92