Merge "[AAF] Use common secret in sms preload"