GPS Support rebased [2/2]

Change-Id: I1bb6bcb81d94afffee86c0955a8772602a659d2a