Merge "Fix failing testDeviceOwnerWithInfo test" into rvc-dev