Fix GPS on Mobile

Change-Id: I8af815ee9c8a9ad7167a582889579eb6f2b1e648