Update for world phone support

Change-Id: I813dc9f3a595d62fb54c1b2c0eeff728c75e9b54