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

Change-Id: I7afe5989ea22c7de70e1fc6e431b232daa180f41