Merge "MMS API: build file change to add MmsService"