Merge "PhoneCapability cleanup"