Merge changes from topics "caps_refactor", "phone-cap-revert"

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