Merge "PhoneCapabilities changes for device capabilities"