Merge "Revert "New SMS and MMS APIs and semantics (1/4)""