Merge "Drop GNSS1.1 and Thermal1.0" am: dc0e2f69ea

Change-Id: I3689b62de7647af50e0e2e5d420ce4475d7c8a27