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

Change-Id: Ied71858790d4b9a2191bf41e7379c8aece1e02ee