base: Phone number location support [Squashed] (1/2)

Change-Id: I71d897ec4dc7f6a2c755b9f9f088686ddd082429