Merge "CompanionDeviceManager"