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

Change-Id: I9c4f40920947cb16bcf066cb6701a21476410e7b