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

Change-Id: Ief4545e006850cdf9fee6748c7bc06a71e4cb49d