Merge "Add aaf/sms.git submodule"