Phone: Location Support (2/2)

Change-Id: Ib63d0e98b66b89378e31454d09b0edd8a820dd47