Merge "Remove internal dependency for PhoneGlobals/Phone"
am: 9e9bf451c2

Change-Id: I04e3b1500f340c209682b942fafc47ac33d25629