Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev