Merge "Fix the inconsistency of action EUICC_FACTORY_RESET" into oc-dr1-dev am: 669f560338 am: 6b48db9770
am: 47d41c1904

Change-Id: I4d7b78bee03e6fed21e434de5b1b674b389f2bb3