Merge "new SMS/MMS carrier app API" into lmp-mr1-dev