Merge "Add sub_id column in SMS and MMS tables." into udc-dev