Merge "Fix log tag for SmsProviderTest" am: 657164eaa5 am: d35074ebcc
am: bb0a9b26cd

Change-Id: Ica40f088f4fc3bd041ff5cdbd9e9bb9292890a57