Merge "Add getPhoneNumber/setPhoneNumber API"