Merge "The method of parseEfSpdi does not match TS24008." am: cd03d0db9d
am: cfbd4a354a

Change-Id: Ic5e764bd0d5ca14498c4b36dd1f2bd9d8ba05544