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

Change-Id: I7fb153ffb517b647ca4557e2313382638469243f