Merge "Bugs fix for eUICC." into pi-dev