Merge "Fallback to other address type for EF_SMS" am: ba15b171ea

Change-Id: If4cfdb6a6afafeea34bb164c7fcb4918fd4ee508