Merge "SMS over IMS APIs revision"
am: 2bf7f03e63

Change-Id: I7296426e1c1fc903d92e324a09598e357e75389b