Merge "Add null check for EuiccManager" into main