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

Change-Id: I5f232d95a32c1c64b7dbc78065e17aa1054746d2