* changes: Revert "Modify PhoneCapabilities for device capabilities" Revert "PhoneCapability cleanup"