BD, ID, MN back to ulsfo

Change-Id: I58940250265975aa1d5cba2a20f87a36e8589a19