Merge "Fix coding styles for erase euicc only options"