Merge "Revert "Modify PhoneCapabilities for device capabilities""