Per current guidance remove legacy markings. Change-Id: I34c7acfad802a3878ffa373489b7f6a4194abb62 CRs-Fixed: 2230684