Merge "Fix parent check for isDeviceFinanced." into udc-dev