MM, TH, VN back to ulsfo

Change-Id: If222250deb5b13759f323df08b90f3e52242c1ef