Merge "Reflect name change done in Phone package"