BN, CC, CX, LA, MV, NP, TL back to ulsfo

Change-Id: Ia4de368cb3481c26032fdeb88b91dd93e0637869