Merge "Fix exception crashing euiccService process" into main