Merge "Revert "Drop GNSS1.1 and Thermal1.0"" into rvc-dev am: 9b0f15d5e1

Change-Id: I1d7f38b3095a3e327160b4c4af6781a9bdc934c8