Merge "Merge "The method of parseEfSpdi does not match TS24008." am: cd03d0db am: cfbd4a35 am: 1cdd44bd am: 793c4be8" into oc-mr1-dev-plus-aosp