Merge "Add fallback for sensor identification in ddc" into sc-dev