Forward port Split SMS functionality

Change-Id: I1091dc2fda319263f6ce32152990eacff3462ff3