Fix thermal-engine, GPS.

Change-Id: Idd20c440a56aa805d6c1d7faae649f60196274dc